Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Increment version to 2.4.2-SNAPSHOT #2372

Merged
merged 1 commit into from
Jan 5, 2023
Merged

Increment version to 2.4.2-SNAPSHOT #2372

merged 1 commit into from
Jan 5, 2023

Conversation

RyanL1997
Copy link
Collaborator

@RyanL1997 RyanL1997 commented Jan 4, 2023 •
edited
Loading

Signed-off-by: Ryan Liang [email protected]

Description

Increment version to 2.4.2-SNAPSHOT

  • Category (Maintenance)

Issues Resolved

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@RyanL1997 RyanL1997 requested a review from a team January 4, 2023 19:42
peternied
peternied requested changes Jan 4, 2023
View reviewed changes
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you are working on this could you alter the updateVersion to handle this automatically for minor version bumps like this one?

security/build.gradle

Lines 636 to 638 in 67e4176

// updateVersion: Task to auto increment to the next development iteration
task updateVersion {
onlyIf { System.getProperty('newVersion') }

@codecov-commenter
Copy link

codecov-commenter commented Jan 4, 2023 •
edited
Loading

Codecov Report

Merging #2372 (1fb9592) into 2.4 (f4dde57) will decrease coverage by 0.08%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##                2.4    #2372      +/-   ##
============================================
- Coverage     61.08%   61.00%   -0.09%     
+ Complexity     3252     3244       -8     
============================================
  Files           258      258              
  Lines         18131    18131              
  Branches       3232     3232              
============================================
- Hits          11076    11060      -16     
- Misses         5483     5495      +12     
- Partials       1572     1576       +4
Impacted Files Coverage Δ
...ecurity/configuration/StaticResourceException.java 0.00% <0.00%> (-25.00%) ⬇️
...ch/security/auditlog/routing/AsyncStoragePool.java 50.00% <0.00%> (-5.56%) ⬇️
...urity/ssl/transport/SecuritySSLNettyTransport.java 62.36% <0.00%> (-4.31%) ⬇️
...nsearch/security/dlic/rest/api/AuditApiAction.java 63.82% <0.00%> (-4.26%) ⬇️
...earch/security/ssl/util/SSLConnectionTestUtil.java 93.18% <0.00%> (-2.28%) ⬇️
.../dlic/auth/ldap2/LDAPConnectionFactoryFactory.java 57.46% <0.00%> (-1.50%) ⬇️
...iance/ComplianceIndexingOperationListenerImpl.java 61.76% <0.00%> (-1.48%) ⬇️
...search/security/transport/SecurityInterceptor.java 75.38% <0.00%> (-0.77%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@RyanL1997
Copy link
Collaborator Author

While you are working on this could you alter the updateVersion to handle this automatically for minor version bumps like this one?

security/build.gradle

Lines 636 to 638 in 67e4176

// updateVersion: Task to auto increment to the next development iteration
task updateVersion {
onlyIf { System.getProperty('newVersion') }

Gotcha!

stephen-crawford
stephen-crawford reviewed Jan 4, 2023
View reviewed changes
.github/workflows/plugin_install.yml
@@ -3,7 +3,7 @@ name: Plugin Install
on: [push, pull_request, workflow_dispatch]

env:
OPENSEARCH_VERSION: 2.4.1
OPENSEARCH_VERSION: 2.4.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could automate this by setting this as an ID and then using something along the lines of:

awk '*-SNAPSHOT' ./build.gradle | awk -F '-' $OPENSEARCH_VERSION=$1

This should parse build.gradle for the string containing the term "-SNAPSHOT" and then pipe that line over where it is split with the deliminator '-' and set the variable to be the first of the substrings.

This may not be perfect syntax but should be close.

@RyanL1997
Copy link
Collaborator Author

Hi @peternied and @scrawfor99, thanks for your info! I have updated the task called updateVersion in build.gradle to do the version increment in workflow.

@RyanL1997
Copy link
Collaborator Author

Hi @peternied and @scrawfor99, thanks for your info! I have updated the task called updateVersion in build.gradle to do the version increment in workflow.

I will create a separate PR against to main to apply these changes

@RyanL1997
Copy link
Collaborator Author

Here is the PR: #2374

@RyanL1997 RyanL1997 mentioned this pull request Jan 4, 2023
Merged
3 tasks
@RyanL1997 RyanL1997 merged commit fa5dcf2 into opensearch-project:2.4 Jan 5, 2023
@RyanL1997 RyanL1997 deleted the version-bump-2.4.2 branch January 5, 2023 17:14
@RyanL1997 RyanL1997 mentioned this pull request Jan 5, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephen-crawford stephen-crawford stephen-crawford left review comments

@cwperks cwperks cwperks approved these changes

@peternied peternied peternied approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RyanL1997 @codecov-commenter @peternied @cwperks @stephen-crawford